projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7baa69e 27478aa)
bitkeeper revision 1.1159.1.465 (41a87e70oLTK39bsiBf2aLAqPrQCVg)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Sat, 27 Nov 2004 13:17:36 +0000 (13:17 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Sat, 27 Nov 2004 13:17:36 +0000 (13:17 +0000)
sync w/ head.

1  2 
linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S patch | diff1 | diff2 | blob | history
linux-2.6.9-xen-sparse/arch/xen/i386/kernel/traps.c patch | diff1 | diff2 | blob | history
xen/arch/x86/x86_32/entry.S patch | diff1 | diff2 | blob | history

diff --cc linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
index 42f0e3e5148cb868a253c633c5ce89a17f6cdf7c,1d19d7986433da709e72fff7a400c65be19117b7..5ca7794fdbee2c07369e4791b2ddb27c2112368a
--- 1/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
--- 2/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
@@@ -79,29 -80,12 +80,22 @@@ VM_MASK            = 0x0002000
  #define evtchn_upcall_pending         /* 0 */
  #define evtchn_upcall_mask            1
  
 +#define sizeof_vcpu_shift             3
 +
 +#ifdef CONFIG_SMP
 +#define XEN_GET_VCPU_INFO(reg)        movl TI_cpu(%ebp),reg                   ; \
 +                              shl  $sizeof_vcpu_shift,reg             ; \
 +                              addl HYPERVISOR_shared_info,reg
 +#else
 +#define XEN_GET_VCPU_INFO(reg)        movl HYPERVISOR_shared_info,reg
 +#endif
 +
  #define XEN_BLOCK_EVENTS(reg) movb $1,evtchn_upcall_mask(reg)
  #define XEN_UNBLOCK_EVENTS(reg)       movb $0,evtchn_upcall_mask(reg)
- #define XEN_TEST_PENDING(reg) testb $0x1,evtchn_upcall_pending(reg)
+ #define XEN_TEST_PENDING(reg) testb $0xFF,evtchn_upcall_pending(reg)
  
  #ifdef CONFIG_PREEMPT
- #ifdef CONFIG_SMP
- #define preempt_stop          GET_THREAD_INFO(%ebp)                   ; \
-                               XEN_GET_VCPU_INFO(%esi)                 ; \
-                               XEN_BLOCK_EVENTS(%esi)
- #else
- #define preempt_stop          XEN_GET_VCPU_INFO(%esi)                 ; \
-                               XEN_BLOCK_EVENTS(%esi)
- #endif
+ #define preempt_stop          XEN_BLOCK_EVENTS(%esi)
  #else
  #define preempt_stop
  #define resume_kernel         restore_all
@@@ -120,7 -104,13 +114,13 @@@
        pushl %ebx; \
        movl $(__USER_DS), %edx; \
        movl %edx, %ds; \
-       movl %edx, %es;
+       movl %edx, %es
+ 
+ #define SAVE_ALL \
+       SAVE_ALL_NO_EVENTMASK; \
 -      movl HYPERVISOR_shared_info, %esi; \
++      XEN_GET_VCPU_INFO(%esi); \
+       movb evtchn_upcall_mask(%esi), %dl; \
+       movb %dl, EVENT_MASK(%esp)
  
  #define RESTORE_INT_REGS \
        popl %ebx;      \
@@@ -438,9 -452,12 +462,12 @@@ error_code
        movl %esp, %edx
        pushl %esi                      # push the error code
        pushl %edx                      # push the pt_regs pointer
-       movl $(__KERNEL_DS), %edx       # XXXcl USER?
+       movl $(__USER_DS), %edx
        movl %edx, %ds
        movl %edx, %es
 -      movl HYPERVISOR_shared_info, %esi
++      XEN_GET_VCPU_INFO(%esi)
+       movb evtchn_upcall_mask(%esi), %dl
+       movb %dl, EVENT_MASK+8(%esp)
        call *%edi
        addl $8, %esp
        jmp ret_from_exception
@@@ -465,15 -481,16 +491,16 @@@ ENTRY(hypervisor_callback
        jb   11f
        cmpl $ecrit,%eax
        jb   critical_region_fixup
- 11:   push %esp
 -11:   movl HYPERVISOR_shared_info, %esi
++11:   XEN_GET_VCPU_INFO(%esi)
+       movb $0, EVENT_MASK(%esp)
+       push %esp
        call evtchn_do_upcall
        add  $4,%esp
-       XEN_GET_VCPU_INFO(%esi)
-       movb CS(%esp),%cl
-       test $2,%cl                     # slow return to ring 2 or 3
-       jne  ret_syscall_tests
+       jmp  ret_from_intr
+ 
+         ALIGN
  restore_all_enable_events:  
- safesti:XEN_UNBLOCK_EVENTS(%esi)      # reenable event callbacks
+       XEN_UNBLOCK_EVENTS(%esi)
  scrit:        /**** START OF CRITICAL REGION ****/
        XEN_TEST_PENDING(%esi)
        jnz  14f                        # process more events if necessary...
@@@ -702,36 -729,37 +739,37 @@@ ENTRY(alignment_check
  
  # This handler is special, because it gets an extra value on its stack,
  # which is the linear faulting address.
- #define PAGE_FAULT_STUB(_name1, _name2)                                         \
- ENTRY(_name1)                                                           \
-       pushl %ds                                                       ; \
-       pushl %eax                                                      ; \
-       xorl %eax,%eax                                                  ; \
-       pushl %ebp                                                      ; \
-       pushl %edi                                                      ; \
-       pushl %esi                                                      ; \
-       pushl %edx                                                      ; \
-       decl %eax                       /* eax = -1 */                  ; \
-       pushl %ecx                                                      ; \
-       pushl %ebx                                                      ; \
-       GET_THREAD_INFO(%ebp)                                           ; \
-       cld                                                             ; \
-       movl %es,%ecx                                                   ; \
-       movl ORIG_EAX(%esp), %esi       /* get the error code */        ; \
-       movl ES(%esp), %edi             /* get the faulting address */  ; \
-       movl %eax, ORIG_EAX(%esp)                                       ; \
-       movl %ecx, ES(%esp)                                             ; \
-       movl %esp,%edx                                                  ; \
-       pushl %edi                      /* push the faulting address */ ; \
-       pushl %esi                      /* push the error code */       ; \
-       pushl %edx                      /* push the pt_regs pointer */  ; \
-       movl $(__KERNEL_DS),%edx                                        ; \
-       movl %edx,%ds                                                   ; \
-       movl %edx,%es                                                   ; \
-       call _name2                                                     ; \
-       addl $12,%esp                                                   ; \
-       jmp ret_from_exception                                          ;
- PAGE_FAULT_STUB(page_fault, do_page_fault)
+ ENTRY(page_fault)
+       pushl %ds
+       pushl %eax
+       xorl %eax,%eax
+       pushl %ebp
+       pushl %edi
+       pushl %esi
+       pushl %edx
+       decl %eax                       /* eax = -1 */
+       pushl %ecx
+       pushl %ebx
+       GET_THREAD_INFO(%ebp)
+       cld
+       movl %es,%ecx
+       movl ORIG_EAX(%esp), %esi       /* get the error code */
+       movl ES(%esp), %edi             /* get the faulting address */
+       movl %eax, ORIG_EAX(%esp)
+       movl %ecx, ES(%esp)
+       movl %esp,%edx
+       pushl %edi                      /* push the faulting address */
+       pushl %esi                      /* push the error code */
+       pushl %edx                      /* push the pt_regs pointer */
+       movl $(__KERNEL_DS),%edx
+       movl %edx,%ds
+       movl %edx,%es
 -      movl HYPERVISOR_shared_info, %esi
++      XEN_GET_VCPU_INFO(%esi)
+       movb evtchn_upcall_mask(%esi), %dl
+       movb %dl, EVENT_MASK+12(%esp)
+       call do_page_fault
+       addl $12,%esp
+       jmp ret_from_exception
  
  #ifdef CONFIG_X86_MCE
  ENTRY(machine_check)
diff --cc xen/arch/x86/x86_32/entry.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.